home *** CD-ROM | disk | FTP | other *** search
/ Linux Cubed Series 3: Developer Tools / Linux Cubed Series 3 - Developer Tools.iso / devel / lang / lisp / blt1.000 / blt1 / blt-1.7-for-STk / BLT-patch next >
Encoding:
Text File  |  1994-07-25  |  6.8 KB  |  249 lines
  1. *** blt-1.7/src/bltDragDrop.c    Thu Apr 14 22:11:03 1994
  2. --- src/bltDragDrop.c    Fri Jul  8 17:09:46 1994
  3. ***************
  4. *** 676,681 ****
  5. --- 676,682 ----
  6.   
  7.               if (dsPtr->button > 0)
  8.               {
  9. + #ifdef ORIGINAL_CODE
  10.                   sprintf(buffer,
  11.                       "bind %.100s <ButtonPress-%d> {%s drag %.100s %%X %%Y}; \
  12.                       bind %.100s <B%d-Motion> {%s drag %.100s %%X %%Y}; \
  13. ***************
  14. *** 683,689 ****
  15.                       argv[2], dsPtr->button, DRAGDROP_COMMAND, argv[2],
  16.                       argv[2], dsPtr->button, DRAGDROP_COMMAND, argv[2],
  17.                       argv[2], dsPtr->button, DRAGDROP_COMMAND, argv[2]);
  18. ! 
  19.                   if (Tcl_Eval(interp, buffer) != TCL_OK)
  20.                   {
  21.                       Tk_DestroyWindow(tokenwin);
  22. --- 684,699 ----
  23.                       argv[2], dsPtr->button, DRAGDROP_COMMAND, argv[2],
  24.                       argv[2], dsPtr->button, DRAGDROP_COMMAND, argv[2],
  25.                       argv[2], dsPtr->button, DRAGDROP_COMMAND, argv[2]);
  26. ! #else
  27. !                 sprintf(buffer,
  28. ! "(begin \
  29. !    (bind %.100s \"<ButtonPress-%d>\" '(%s 'drag %.100s |%%X| |%%Y|)) \
  30. !    (bind %.100s \"<B%d-Motion>\" '(%s 'drag %.100s |%%X| |%%Y|)) \
  31. !    (bind %.100s \"<ButtonRelease-%d>\" '(%s 'drop %.100s |%%X| |%%Y|)))",
  32. !                     argv[2], dsPtr->button, DRAGDROP_COMMAND, argv[2],
  33. !                     argv[2], dsPtr->button, DRAGDROP_COMMAND, argv[2],
  34. !                     argv[2], dsPtr->button, DRAGDROP_COMMAND, argv[2]);
  35. ! #endif
  36.                   if (Tcl_Eval(interp, buffer) != TCL_OK)
  37.                   {
  38.                       Tk_DestroyWindow(tokenwin);
  39. ***************
  40. *** 887,893 ****
  41. --- 897,908 ----
  42.                */
  43.               dsPtr->pkgcmdInProg = ~0;
  44.               status = Tcl_VarEval(dsPtr->ddlist->interp,
  45. + #ifdef ORIGINAL_CODE
  46.                   dsPtr->pkgcmd, " ", Tk_PathName(dsPtr->tokenwin),
  47. + #else
  48. +                 "(", dsPtr->pkgcmd, " '", 
  49. +                 Tk_PathName(dsPtr->tokenwin), ")",
  50. + #endif
  51.                   (char*)NULL);
  52.               dsPtr->pkgcmdInProg = 0;
  53.   
  54. ***************
  55. *** 914,920 ****
  56. --- 929,939 ----
  57.                   if (ddlist->errorProc && *ddlist->errorProc)
  58.                   {
  59.                       return Tcl_VarEval(ddlist->interp,
  60. + #ifdef ORIGINAL_CODE
  61.                           ddlist->errorProc, " {", ddlist->interp->result, "}",
  62. + #else
  63. +                         "(", ddlist->errorProc, " ", (char *) STk_Stringify(ddlist->interp->result, 0), ")",
  64. + #endif
  65.                           (char*)NULL);
  66.                   }
  67.                   else
  68. ***************
  69. *** 927,933 ****
  70. --- 946,956 ----
  71.               if (dsPtr->tokenCursor != None)
  72.               {
  73.                   status = Tcl_VarEval(dsPtr->ddlist->interp,
  74. + #ifdef ORIGINAL_CODE
  75.                       Tk_PathName(dsPtr->tkwin), " config -cursor",
  76. + #else
  77. +                         "(", Tk_PathName(dsPtr->tkwin), " 'config :cursor)",
  78. + #endif
  79.                       (char*)NULL);
  80.   
  81.                   if (status == TCL_OK)
  82. ***************
  83. *** 1690,1696 ****
  84. --- 1713,1723 ----
  85.   
  86.           sprintf(buffer, "%d %d", dsPtr->tokenx, dsPtr->tokeny);
  87.           status = Tcl_VarEval(ddlist->interp,
  88. + #ifdef ORIGINAL_CODE
  89.               "send {",target->ddinterp,"} ", DRAGDROP_COMMAND," location ",buffer,
  90. + #else
  91. +             "(send ",target->ddinterp," '(", DRAGDROP_COMMAND," 'location ",buffer,"))", 
  92. + #endif
  93.               (char*)NULL);
  94.   
  95.           if (status == TCL_OK)
  96. ***************
  97. *** 1699,1706 ****
  98. --- 1726,1738 ----
  99.               if (sendcmd)
  100.               {
  101.                   status = Tcl_VarEval(ddlist->interp,
  102. + #ifdef ORIGINAL_CODE
  103.                       sendcmd, " {",target->ddinterp,"} {",target->ddwin,
  104.                       "} {",dsPtr->pkgcmdResult,"}",
  105. + #else
  106. +                     "(", sendcmd, " ",target->ddinterp," '",target->ddwin,
  107. +                     " '",dsPtr->pkgcmdResult,")",
  108. + #endif                             
  109.                       (char*)NULL);
  110.               }
  111.               else
  112. ***************
  113. *** 1727,1733 ****
  114. --- 1759,1770 ----
  115.   
  116.               if (ddlist->errorProc && *ddlist->errorProc)
  117.                   (void) Tcl_VarEval(ddlist->interp,
  118. + #ifdef ORIGINAL_CODE
  119.                       ddlist->errorProc, " {", ddlist->interp->result, "}",
  120. + #else
  121. +                     "(", ddlist->errorProc, " ", 
  122. +                      (char *) STk_Stringify(ddlist->interp->result, 0), ")",
  123. + #endif
  124.                       (char*)NULL);
  125.           }
  126.       }
  127. ***************
  128. *** 1762,1772 ****
  129.        */
  130.       Tcl_ResetResult(interp); /* for Tcl_AppendResult() below */
  131.       if (Tcl_VarEval(interp,
  132.           "send {",interpName,"} ", DRAGDROP_COMMAND," target {",ddName,"} handler",
  133.           (char*)NULL) != TCL_OK)
  134.           return NULL;
  135. ! 
  136.       hlist = strdup(interp->result);
  137.       if (Tcl_SplitList(interp, hlist, &hndlc, &hndlv) == TCL_OK)
  138.       {
  139.           /*
  140. --- 1799,1826 ----
  141.        */
  142.       Tcl_ResetResult(interp); /* for Tcl_AppendResult() below */
  143.       if (Tcl_VarEval(interp,
  144. + #ifdef ORIGINAL_CODE
  145.           "send {",interpName,"} ", DRAGDROP_COMMAND," target {",ddName,"} handler",
  146. + #else
  147. +         "(send ",interpName," '(", DRAGDROP_COMMAND," 'target '",ddName," 'handler))",
  148. + #endif
  149.           (char*)NULL) != TCL_OK)
  150.           return NULL;
  151. ! #ifdef ORIGINAL_CODE
  152.       hlist = strdup(interp->result);
  153. + #else
  154. +     /* DIRTY HACKS..... But I don't know how to make it work better */
  155. +     /* Result of send is always a string in STk. So there are '"' to delete */
  156. +     /* Furthermore, The STk Tcl_SplitList doesn't handle very well lists */
  157. +     if (*(interp->result)) {
  158. +       int x = ((interp->result)[1]) == '('? 2: 1;
  159. + 
  160. +       hlist = strdup(interp->result + x);
  161. +       hlist[strlen(hlist)-x] = '\0';
  162. +     }
  163. +     else 
  164. +       hlist = strdup(interp->result);
  165. + #endif
  166.       if (Tcl_SplitList(interp, hlist, &hndlc, &hndlv) == TCL_OK)
  167.       {
  168.           /*
  169. ***************
  170. *** 2117,2123 ****
  171. --- 2171,2181 ----
  172.               char *p = wr->ddprop;
  173.               wr->ddinterp = wr->ddprop;
  174.   
  175. + #ifdef ORIGINAL_CODE
  176.               while ((*p != '\0') && (*p != ']'))
  177. + #else
  178. +             while ((*p != '\0') && (*p != '}'))
  179. + #endif
  180.                   p++;
  181.   
  182.               if (*p != '\0')
  183. ***************
  184. *** 2126,2132 ****
  185. --- 2184,2194 ----
  186.                   wr->ddwin = p;       /* get start of window name */
  187.               }
  188.   
  189. + #ifdef ORIGINAL_CODE
  190.               while ((*p != '\0') && (*p != ']'))
  191. + #else
  192. +             while ((*p != '\0') && (*p != '}'))
  193. + #endif
  194.                   p++;
  195.   
  196.               if (*p != '\0')
  197. ***************
  198. *** 2201,2213 ****
  199. --- 2263,2286 ----
  200.   
  201.       if (dtPtr->tkwin != None)
  202.       {
  203. + #ifdef ORIGINAL_CODE
  204.           static char command[] = { "winfo name ." };
  205. + #else
  206. +         static char command[] = { "(winfo 'name *root*)" };
  207. + #endif
  208.   
  209.           path = Tk_PathName(dtPtr->tkwin);
  210. + #ifdef ORIGINAL_CODE
  211.           if (Tcl_Eval(interp, command)==TCL_OK)
  212.               sprintf(buffer, "%s]%s]", interp->result, path);
  213.           else
  214.               sprintf(buffer, "]%s]", path);
  215. + #else
  216. +         if (Tcl_Eval(interp, command)==TCL_OK)
  217. +             sprintf(buffer, "%s}%s}", interp->result, path);
  218. +         else
  219. +             sprintf(buffer, "}%s}", path);
  220. + #endif
  221.   
  222.           Tcl_SetResult(interp, buffer, TCL_VOLATILE);
  223.           for (thandl=dtPtr->handlers; thandl; thandl=thandl->next)
  224. ***************
  225. *** 2383,2395 ****
  226. --- 2456,2477 ----
  227.   
  228.               sprintf(buffer, "%d", status);
  229.               if ((Tcl_VarEval(dsPtr->ddlist->interp,
  230. + #ifdef ORIGINAL_CODE
  231.                       dsPtr->sitecmd," ",buffer," ",Tk_PathName(dsPtr->tokenwin),
  232. + #else
  233. +                     "(", dsPtr->sitecmd," ",buffer," '",Tk_PathName(dsPtr->tokenwin), ")",
  234. + #endif
  235.                       (char*)NULL) != TCL_OK) &&
  236.                   dsPtr->ddlist->errorProc && *dsPtr->ddlist->errorProc)
  237.   
  238.                   (void) Tcl_VarEval(dsPtr->ddlist->interp,
  239. + #ifdef ORIGINAL_CODE
  240.                       dsPtr->ddlist->errorProc, " {",
  241.                       dsPtr->ddlist->interp->result, "}",
  242. + #else
  243. +                     "(", dsPtr->ddlist->errorProc, " ",
  244. +                      (char *) STk_Stringify(dsPtr->ddlist->interp->result, 0), ")",
  245. + #endif
  246.                       (char*)NULL);
  247.           }
  248.       }
  249.